Auto merge of #5613 - oli-obk:master, r=matklad
authorbors <bors@rust-lang.org>
Wed, 6 Jun 2018 17:32:01 +0000 (17:32 +0000)
committerbors <bors@rust-lang.org>
Wed, 6 Jun 2018 17:32:01 +0000 (17:32 +0000)
commit946ab0040c26b17f6d49eaf7e21bfaeee64ac211
tree4b692afd9c86d7fe3e0fef2ad969b7dbbb770918
parentd33c65cbd9d6f7ba1e18b2cdb85fea5a09973d3b
parent1bdb89d997c689c1b576392a32b33d36b189ad20
Auto merge of #5613 - oli-obk:master, r=matklad

Allow rustc bootstrap to use unstable features even though it's using a beta-cargo

This is the sane alternative to https://github.com/rust-lang/rust/pull/51322#issuecomment-394828839

cc @kennytm